Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 7 Jul 2011 01:44:57 +0000 (18:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 7 Jul 2011 01:44:57 +0000 (18:44 -0700)
commitbbe062b640deee13ff67bfe20e0f7b06e3e6442e
tree8353b3873c6bea10234fc968da7e8fe5e7e70fdd
parentc3356e0e9d333519ef909d8e185ef1a7eeb8846b
parentec5b528aac6118e65f8787c1047e1ea502291303
Merge from trunk.